Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BR: Fix stuck when many missing-peer regions in cluster (#28497) #28680

Merged
merged 4 commits into from
Oct 13, 2021
Merged

BR: Fix stuck when many missing-peer regions in cluster (#28497) #28680

merged 4 commits into from
Oct 13, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Oct 9, 2021 •
edited
Loading

cherry-pick #28497 to release-5.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/28680

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/28680:release-5.2-6782628bc181

What problem does this PR solve?

Issue Number: close #27534

Problem Summary:
Even BR would skip when store count less than max-replica, the replica requirement via placement rules is still possible to make the restore stuck.

What is changed and how it works?

What's Changed:
"Parallel" all scatter request... (No many goroutines spawned, see the code)

How it Works:
So it wouldn't be stuck.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note 

Fixed a bug that caused BR get stuck when many missing-peer regions in cluster.

@YuJuncen @ti-srebot
cherry pick pingcap#28497 to release-5.2
91ebfb0 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 9, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • glorv
  • kennytm

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 9, 2021
@ti-srebot ti-srebot mentioned this pull request Oct 9, 2021
Merged
4 tasks
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. sig/migrate size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.2-cherry-pick labels Oct 9, 2021
@ti-srebot
Copy link
Contributor Author

@YuJuncen please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

@YuJuncen
Copy link
Contributor

/cherry-pick-invite

@ti-srebot
Copy link
Contributor Author

@YuJuncen please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 11, 2021
@YuJuncen
Copy link
Contributor

[2021-10-11T07:07:51.451Z] ./tools/check/check-errdoc.sh
[2021-10-11T07:08:01.473Z] Generate successfully, output:
[2021-10-11T07:08:01.473Z] Non-normalized error: insert statement not found
[2021-10-11T07:08:01.473Z] Duplicated error code: types:1292
[2021-10-11T07:08:01.473Z] Non-normalized error: can not add because sorted
[2021-10-11T07:08:01.473Z] Non-normalized error: Pattern not match
[2021-10-11T07:08:01.473Z] Non-normalized error: label constraint should be in format '{+|-}key=value'
[2021-10-11T07:08:01.473Z] Non-normalized error: unsupported label constraint
[2021-10-11T07:08:01.473Z] Non-normalized error: conflicting label constraints
[2021-10-11T07:08:01.473Z] Non-normalized error: label constraints in map syntax have invalid replicas
[2021-10-11T07:08:01.473Z] Non-normalized error: invalid label constraints format
[2021-10-11T07:08:01.473Z] Non-normalized error: label constraints with invalid REPLICAS
[2021-10-11T07:08:01.473Z] Non-normalized error: invalid bundle ID
[2021-10-11T07:08:01.473Z] Non-normalized error: invalid bundle ID format
[2021-10-11T07:08:01.473Z] Non-normalized error: REPLICAS must be 1 if ROLE=leader
[2021-10-11T07:08:01.473Z] Non-normalized error: the ROLE field is not specified
[2021-10-11T07:08:01.473Z] Non-normalized error: no rule of such role to drop
[2021-10-11T07:08:01.473Z] Non-normalized error: retryable: lock not found
[2021-10-11T07:08:01.473Z] Non-normalized error: retryable: already rollback
[2021-10-11T07:08:01.473Z] Non-normalized error: retryable: replaced by another transaction

🤔

@YuJuncen
Copy link
Contributor

/run-check_dev 🤔

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 11, 2021
@glorv
Copy link
Contributor

glorv commented Oct 11, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 02e7d0e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 11, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 13, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit e8519dd into pingcap:release-5.2 Oct 13, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.2.2 milestone Oct 20, 2021
@zimulala zimulala mentioned this pull request Oct 25, 2021
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm approved these changes

@glorv glorv glorv approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

Assignees

@YuJuncen YuJuncen

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/migrate size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.2-cherry-pick
Projects
None yet
Milestone
v5.2.2
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @YuJuncen @glorv @zhouqiang-cl @kennytm